const login: LoginProps = async (username, password): Promise<boolean> => {
   dispatch({ type: ACTION_TYPE_LOADING, payload: { isLoading: true } });
   removeLocalStorage();
 
   const _nonce = uuidv4();
   setNonce(_nonce);
 
   logger("login: Logging in with password");
 
   const type = AUTH_TYPES.CODE;
   const { code_verifier, code_challenge } = await pkceChallengePair();
-  const preResponse = await getPreAuthCode({
-    nonce: _nonce,
-    clientId,
-    code_challenge,
-  });
 
+  const timeoutPromise = new Promise((_, reject) =>
+    setTimeout(() => reject(new Error("Login timeout")), 30000)
+  );
+
+  try {
+    const preResponse = await Promise.race([
+      getPreAuthCode({
+        nonce: _nonce,
+        clientId,
+        code_challenge,
+      }),
+      timeoutPromise
+    ]);
+

-export const loginUser = async ({
+export const authenticateUser = async ({
 

 if (response.status) {
   setIdToken(response.idToken);
   setAccessToken(response.accessToken);
   setRefreshToken(response.refreshToken);
   dispatch({
     type: ACTION_TYPE_LOGIN,
     payload: {
       user: {
         userId: response.userId as string,
         username,
       },
     },
   });
   return true;
+} else {
+  logger("login: Login failed", response.error || "Unknown error");
+  removeStateAndLocalStorage(LOGIN_ERROR);
+  return false;
 }
-removeStateAndLocalStorage(LOGIN_ERROR);
-return false;
 

-dispatch({
-  type: ACTION_TYPE_LOGIN,
-  payload: {
-    user: {
-      userId: response.userId as string,
-      username,
+if (response.userId) {
+  dispatch({
+    type: ACTION_TYPE_LOGIN,
+    payload: {
+      user: {
+        userId: response.userId,
+        username,
+      },
     },
-  },
-});
+  });
+} else {
+  logger("login: User ID is missing from the response");
+  removeStateAndLocalStorage(LOGIN_ERROR);
+  return false;
+}